Node / ReticulumProjects / LXMF.git / commits / 0cb7714

Parents : 672d754

Author : Mark Qvist <mark@unsigned.io>

Date : 2024-10-11T23:40:27+02:00

Fixed incorrect progress values on path waiting

1 files changed, 3 insertions(+), 3 deletions(-)

M LXMF/LXMRouter.py +3 -3

--- a/LXMF/LXMRouter.py

+++ b/LXMF/LXMRouter.py

lxmessage.delivery_attempts += 1

RNS.Transport.request_path(lxmessage.get_destination().hash)

lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT

elif lxmessage.delivery_attempts == LXMRouter.MAX_PATHLESS_TRIES+1 and RNS.Transport.has_path(lxmessage.get_destination().hash):

RNS.log(f"Opportunistic delivery for {lxmessage} still unsuccessful after {lxmessage.delivery_attempts} attempts, trying to rediscover path to {RNS.prettyhexrep(lxmessage.get_destination().hash)}", RNS.LOG_DEBUG)

lxmessage.delivery_attempts += 1

RNS.Transport.request_path(lxmessage.get_destination().hash)

threading.Thread(target=rediscover_job, daemon=True).start()

lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT

else:

if not hasattr(lxmessage, "next_delivery_attempt") or time.time() > lxmessage.next_delivery_attempt:

lxmessage.delivery_attempts += 1

RNS.log("No path known for delivery attempt "+str(lxmessage.delivery_attempts)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash)+". Requesting path...", RNS.LOG_DEBUG)

RNS.Transport.request_path(lxmessage.get_destination().hash)

lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT

else:

RNS.log("Max delivery attempts reached for direct "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)

self.fail_message(lxmessage)